Revision: bazaar--devo--1.3--patch-76
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Fri Apr 15 06:40:41 BST 2005
Standard-date: 2005-04-15 05:40:41 GMT
Modified-files: libarch/apply-changeset.c libarch/diffs.c
    libarch/diffs.h libarch/make-changeset.c
    tests/test-merge.sh
New-patches: jblack@gnuarch.org--2005/baz--authentication--1.3--patch-12
    jblack@gnuarch.org--2005/baz--authentication--1.3--patch-13
    lord@emf.net--2005/tla--devo--1.3.2--patch-6
    lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
    lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
    lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-12
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
    thelove@canonical.com/bazaar--devo--1.3--patch-76
    thelove@canonical.com/bazaar--devo--1.4--patch-10
    thelove@canonical.com/bazaar--devo--1.4--patch-12
    thelove@canonical.com/bazaar--devo--1.4--patch-13
Summary: bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-12
   Merge from upstream

 * jblack@gnuarch.org--2005/baz--authentication--1.3--patch-13
   Wrote a parser so that authinfo can handle quotes. (My first parser ever)

 * lord@emf.net--2005/tla--devo--1.3.2--patch-6
   [CLOSE inode-sig]

 * lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
   tag of lord@emf.net--2005/tla--devo--1.3.2--patch-5

 * lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
   tag of lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0

 * lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
   [CLOSE sandia-jjengland/inode-sig]

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-12
   merge in inode-sigs hide permission changes bugfix from tla 1.3.2

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
   merge thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
   add test for three way merging when tagging rules change

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.4--patch-10
   revert latest thelove sftp patch - breaks on some systems

 * thelove@canonical.com/bazaar--devo--1.4--patch-12
   fix memory leak in authinfo support

 * thelove@canonical.com/bazaar--devo--1.4--patch-13
   Wrote a parser so that authinfo can handle quotes. 

